Adwaita: menu checks and radios making sense

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 701afd7f28e27b14795cdb9740cec7cb1e9abb43..7a3b9721c91755abfd53424e39fe8ec618ca02e0 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1747,38 +1747,14 @@ $asset_suffix: if($variant=='dark', '-dark', '');
 
   //menu
   .menu .menuitem.#{$w} {
-    icon-shadow: none;
-    color: transparentize($fg_color,0.9);
-    background-image: none;
     -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
-    &:hover { color: transparentize($selected_fg_color,0.9); }
+    icon-shadow: none;
     &:active, &:checked {
-      color: $fg_color;
       -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic');
-      &:hover {
-        -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); //specificity workaround
-        color: $selected_fg_color;
-      }
-      &:insensitive {
-        color: $insensitive_fg_color;
-        background-image: none;
-        &:backdrop { color: $backdrop_insensitive_color; };
-      }
-      &:backdrop {
-        -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); //specificity workaround
-        color: $backdrop_fg_color;
-      }
-    }
-    &:insensitive {
-      color: transparentize($insensitive_fg_color,0.9);
-      &:backdrop { color: transparent; }
     }
     &:inconsistent {
       -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic');
     }
-    &:backdrop, &:backdrop:hover {
-      color: transparentize($backdrop_fg_color,0.9);
-    }
   }
 }
 

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 76ed4ab388537f651cbd9fd398694f6dbe8f35cb..6f0ce5fe41bd4cf22a022036577abe203f8caefc 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -2020,34 +2020,12 @@ GtkSwitch {
   icon-shadow: none; }
 
 .menu .menuitem.check {
-  icon-shadow: none;
-  color: rgba(238, 238, 236, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); }
-  .menu .menuitem.check:hover {
-    color: rgba(255, 255, 255, 0.1); }
+  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
+  icon-shadow: none; }
   .menu .menuitem.check:active, .menu .menuitem.check:checked {
-    color: #eeeeec;
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-    .menu .menuitem.check:active:hover, .menu .menuitem.check:checked:hover {
-      -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-      color: #ffffff; }
-    .menu .menuitem.check:active:insensitive, .menu .menuitem.check:checked:insensitive {
-      color: #939695;
-      background-image: none; }
-      .menu .menuitem.check:active:insensitive:backdrop, .menu .menuitem.check:checked:insensitive:backdrop {
-        color: #5d6767; }
-    .menu .menuitem.check:active:backdrop, .menu .menuitem.check:checked:backdrop {
-      -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-      color: #c9cbc9; }
-  .menu .menuitem.check:insensitive {
-    color: rgba(147, 150, 149, 0.1); }
-    .menu .menuitem.check:insensitive:backdrop {
-      color: transparent; }
   .menu .menuitem.check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  .menu .menuitem.check:backdrop, .menu .menuitem.check:backdrop:hover {
-    color: rgba(201, 203, 201, 0.1); }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
@@ -2122,34 +2100,12 @@ GtkSwitch {
   icon-shadow: none; }
 
 .menu .menuitem.radio {
-  icon-shadow: none;
-  color: rgba(238, 238, 236, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-icontheme("radio-symbolic"); }
-  .menu .menuitem.radio:hover {
-    color: rgba(255, 255, 255, 0.1); }
+  -gtk-icon-source: -gtk-icontheme("radio-symbolic");
+  icon-shadow: none; }
   .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
-    color: #eeeeec;
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-    .menu .menuitem.radio:active:hover, .menu .menuitem.radio:checked:hover {
-      -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-      color: #ffffff; }
-    .menu .menuitem.radio:active:insensitive, .menu .menuitem.radio:checked:insensitive {
-      color: #939695;
-      background-image: none; }
-      .menu .menuitem.radio:active:insensitive:backdrop, .menu .menuitem.radio:checked:insensitive:backdrop {
-        color: #5d6767; }
-    .menu .menuitem.radio:active:backdrop, .menu .menuitem.radio:checked:backdrop {
-      -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-      color: #c9cbc9; }
-  .menu .menuitem.radio:insensitive {
-    color: rgba(147, 150, 149, 0.1); }
-    .menu .menuitem.radio:insensitive:backdrop {
-      color: transparent; }
   .menu .menuitem.radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  .menu .menuitem.radio:backdrop, .menu .menuitem.radio:backdrop:hover {
-    color: rgba(201, 203, 201, 0.1); }
 
 GtkTreeView.view.check, GtkTreeView.view.radio {
   icon-shadow: none; }

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 57797f83daa695e20abbc6e35d55417aca35e37b..5abf7337c34dbd69d6dc859cefc6c36f5e565fcf 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -2015,34 +2015,12 @@ GtkSwitch {
   icon-shadow: none; }
 
 .menu .menuitem.check {
-  icon-shadow: none;
-  color: rgba(46, 52, 54, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); }
-  .menu .menuitem.check:hover {
-    color: rgba(255, 255, 255, 0.1); }
+  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
+  icon-shadow: none; }
   .menu .menuitem.check:active, .menu .menuitem.check:checked {
-    color: #2e3436;
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-    .menu .menuitem.check:active:hover, .menu .menuitem.check:checked:hover {
-      -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-      color: #ffffff; }
-    .menu .menuitem.check:active:insensitive, .menu .menuitem.check:checked:insensitive {
-      color: #8d9091;
-      background-image: none; }
-      .menu .menuitem.check:active:insensitive:backdrop, .menu .menuitem.check:checked:insensitive:backdrop {
-        color: #c7c7c7; }
-    .menu .menuitem.check:active:backdrop, .menu .menuitem.check:checked:backdrop {
-      -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-      color: #54595a; }
-  .menu .menuitem.check:insensitive {
-    color: rgba(141, 144, 145, 0.1); }
-    .menu .menuitem.check:insensitive:backdrop {
-      color: transparent; }
   .menu .menuitem.check:inconsistent {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  .menu .menuitem.check:backdrop, .menu .menuitem.check:backdrop:hover {
-    color: rgba(84, 89, 90, 0.1); }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
@@ -2117,34 +2095,12 @@ GtkSwitch {
   icon-shadow: none; }
 
 .menu .menuitem.radio {
-  icon-shadow: none;
-  color: rgba(46, 52, 54, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-icontheme("radio-symbolic"); }
-  .menu .menuitem.radio:hover {
-    color: rgba(255, 255, 255, 0.1); }
+  -gtk-icon-source: -gtk-icontheme("radio-symbolic");
+  icon-shadow: none; }
   .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
-    color: #2e3436;
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-    .menu .menuitem.radio:active:hover, .menu .menuitem.radio:checked:hover {
-      -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-      color: #ffffff; }
-    .menu .menuitem.radio:active:insensitive, .menu .menuitem.radio:checked:insensitive {
-      color: #8d9091;
-      background-image: none; }
-      .menu .menuitem.radio:active:insensitive:backdrop, .menu .menuitem.radio:checked:insensitive:backdrop {
-        color: #c7c7c7; }
-    .menu .menuitem.radio:active:backdrop, .menu .menuitem.radio:checked:backdrop {
-      -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-      color: #54595a; }
-  .menu .menuitem.radio:insensitive {
-    color: rgba(141, 144, 145, 0.1); }
-    .menu .menuitem.radio:insensitive:backdrop {
-      color: transparent; }
   .menu .menuitem.radio:inconsistent {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  .menu .menuitem.radio:backdrop, .menu .menuitem.radio:backdrop:hover {
-    color: rgba(84, 89, 90, 0.1); }
 
 GtkTreeView.view.check, GtkTreeView.view.radio {
   icon-shadow: none; }